Bug Fixes
James Peret
15 changed files with 34 additions and 16 deletions
BIN
.DS_Store
+ 1
- 0
.gitignore
@@ -8,3 +8,4 @@ sftpCache.json |
||
| 8 | 8 |
.DS_Store |
| 9 | 9 |
app/.DS_Store |
| 10 | 10 |
app/images/.DS_Store |
| 11 |
+*/DS_Store |
+ 1
- 1
Gruntfile.js
@@ -435,7 +435,7 @@ module.exports = function (grunt) {
|
||
| 435 | 435 |
}, |
| 436 | 436 |
cache: 'sftpCache.json', |
| 437 | 437 |
src: 'dist', |
| 438 |
- dest: '/var/www/oficina-itapeti/public_html/teste/', |
|
| 438 |
+ dest: '/var/www/oficina-itapeti/public_html/', |
|
| 439 | 439 |
exclusions: ['/dist/**/.DS_Store', '/dist/**/Thumbs.db', 'dist/tmp'], |
| 440 | 440 |
serverSep: '/', |
| 441 | 441 |
concurrency: 4, |
BIN
app/.DS_Store
BIN
app/images/.DS_Store
BIN
app/images/blueprint-small.jpg
BIN
app/images/blueprint.jpg
BIN
app/images/fejao-2.jpg
BIN
app/images/fejao-old.jpg
BIN
app/images/fejao.jpg
+ 1
- 1
app/index.html
@@ -66,7 +66,7 @@ |
||
| 66 | 66 |
<a href="http://facebook.com/oficina.itapeti" target="_blank"><img src="images/logo-facebook.png" style="width: 50px;"></a> |
| 67 | 67 |
</div> |
| 68 | 68 |
<div class="col-md-4" style="text-align: center;"> |
| 69 |
- <p style="text-align: center;"><i>Estrada José Benedito dos Santos, 4000<br>Guararema, SP - Brasil</i></p> |
|
| 69 |
+ <p style="text-align: center;"><i>Guararema, SP - Brasil<br>CEP: 08900-000</i></p> |
|
| 70 | 70 |
</div> |
| 71 | 71 |
</div> |
| 72 | 72 |
<hr style="border-top: 1px solid #636363; margin-top: 5px; margin-bottom: 5px;"> |
+ 11
- 7
app/scripts/controllers/main.js
@@ -14,15 +14,16 @@ angular.module('siteOficinaItapetiApp')
|
||
| 14 | 14 |
console.log("Current Page: " + $state.current.name);
|
| 15 | 15 |
|
| 16 | 16 |
var user_email = $cookies.get("email");
|
| 17 |
- if(user_email == "" || user_email == undefined){
|
|
| 17 |
+ if(user_email === "" || user_email === undefined){
|
|
| 18 | 18 |
mixpanel.track("Page Visit", {"Page": $state.current.name});
|
| 19 | 19 |
} else {
|
| 20 |
- mixpanel.identify(user_mail); |
|
| 20 |
+ mixpanel.identify(user_email); |
|
| 21 | 21 |
mixpanel.track("Page Visit", {"Page": $state.current.name});
|
| 22 | 22 |
} |
| 23 | 23 |
|
| 24 | 24 |
|
| 25 | 25 |
$scope.Math = window.Math; |
| 26 |
+ $scope.show_sent_message = false; |
|
| 26 | 27 |
|
| 27 | 28 |
$scope.laser_cut = {
|
| 28 | 29 |
value: 0, |
@@ -49,7 +50,7 @@ angular.module('siteOficinaItapetiApp')
|
||
| 49 | 50 |
|
| 50 | 51 |
$scope.sendMessage = function(msgData){
|
| 51 | 52 |
console.log("> Sending message from " + msgData.first_name + " " + msgData.last_name);
|
| 52 |
- var msg = "Nome: " + msgData.first_name + " " + msgData.last_name + "\nEmail: " msgData.email + "\n\n"; |
|
| 53 |
+ var msg = "Nome: " + msgData.first_name + " " + msgData.last_name + "<br>Email: " + msgData.email + "<br>"; |
|
| 53 | 54 |
var req = {
|
| 54 | 55 |
method: 'POST', |
| 55 | 56 |
url: 'send_contact_mail.php', |
@@ -60,10 +61,7 @@ angular.module('siteOficinaItapetiApp')
|
||
| 60 | 61 |
msg: msg + msgData.message |
| 61 | 62 |
} |
| 62 | 63 |
} |
| 63 |
- |
|
| 64 |
- $http(req).then(function(data){
|
|
| 65 |
- console.log(data); |
|
| 66 |
- }); |
|
| 64 |
+ mixpanel.identify(msgData.email); |
|
| 67 | 65 |
mixpanel.people.set({
|
| 68 | 66 |
"$email": msgData.email, |
| 69 | 67 |
"$first_name": msgData.first_name, |
@@ -71,6 +69,12 @@ angular.module('siteOficinaItapetiApp')
|
||
| 71 | 69 |
}); |
| 72 | 70 |
mixpanel.track("Message Sent", {"Page": $state.current.name});
|
| 73 | 71 |
$cookies.put("email", msgData.email);
|
| 72 |
+ $http(req).then(function(data){
|
|
| 73 |
+ console.log(data); |
|
| 74 |
+ }); |
|
| 75 |
+ msgData.subject = ""; |
|
| 76 |
+ msgData.message = ""; |
|
| 77 |
+ $scope.show_sent_message = true; |
|
| 74 | 78 |
}; |
| 75 | 79 |
|
| 76 | 80 |
$scope.images = [ |
+ 6
- 2
app/styles/main.css
@@ -78,7 +78,7 @@ body {
|
||
| 78 | 78 |
margin-left:25px; |
| 79 | 79 |
} |
| 80 | 80 |
|
| 81 |
-@media screen and (min-width: 350px) { .banner-text {margin-top: 35%; } }
|
|
| 81 |
+@media screen and (min-width: 350px) { .banner-text {margin-top: 40%; } }
|
|
| 82 | 82 |
|
| 83 | 83 |
/* Responsive: Portrait tablets and up */ |
| 84 | 84 |
@media screen and (min-width: 768px) {
|
@@ -107,7 +107,7 @@ body {
|
||
| 107 | 107 |
} |
| 108 | 108 |
|
| 109 | 109 |
.banner-text {
|
| 110 |
- margin-top: 18%; |
|
| 110 |
+ margin-top: 14%; |
|
| 111 | 111 |
} |
| 112 | 112 |
} |
| 113 | 113 |
|
@@ -189,3 +189,7 @@ a:hover { cursor: pointer;}
|
||
| 189 | 189 |
margin: 1.1em 15px; |
| 190 | 190 |
font-size: 1.1em; |
| 191 | 191 |
} |
| 192 |
+ |
|
| 193 |
+.btn-success {
|
|
| 194 |
+ background-color: #83B754; |
|
| 195 |
+} |
+ 8
- 2
app/views/contato.html
@@ -2,7 +2,7 @@ |
||
| 2 | 2 |
<div style="position: absolute; width: 100%"> |
| 3 | 3 |
<div class="banner-text"> |
| 4 | 4 |
<div class="col-md-12"> |
| 5 |
- <h2 style="text-align: center;" class="hidden-xs">Siga a Oficina Itapeti nas redes sociais:</h2> |
|
| 5 |
+ <h2 style="text-align: center;" class="hidden-xs">Siga nas redes sociais:</h2> |
|
| 6 | 6 |
<p style="text-align: center;"> |
| 7 | 7 |
<a href="https://www.instagram.com/oficina.itapeti/" target="_blank"><img src="images/logo-instagram-branco.png" style="width: 75px;"></a> |
| 8 | 8 |
<a href="http://youtube.com/higheffectsBR" target="_blank"><img src="images/logo-youtube-branco.png" style="width: 75px;"></a> |
@@ -11,7 +11,8 @@ |
||
| 11 | 11 |
</div> |
| 12 | 12 |
</div> |
| 13 | 13 |
</div> |
| 14 |
- <img src="images/blueprint.jpg" alt="..." style="width: 100%; margin-top: 100px; max-height: 500px;"> |
|
| 14 |
+ <img src="images/blueprint.jpg" alt="..." style="width: 100%; margin-top: 100px; max-height: 500px;" class="hidden-xs"> |
|
| 15 |
+ <img src="images/blueprint-small.jpg" alt="..." style="width: 100%; margin-top: 100px; max-height: 500px;" class="visible-xs"> |
|
| 15 | 16 |
</div> |
| 16 | 17 |
|
| 17 | 18 |
<div class="container last" style="margin-top: 50px;"> |
@@ -23,6 +24,10 @@ |
||
| 23 | 24 |
Deixe uma mensagem ou envie um email para <a href="mailto:oficina.itapeti@gmail.com">oficina.itapeti@gmail.com</a> |
| 24 | 25 |
</p> |
| 25 | 26 |
<br> |
| 27 |
+ <div class="alert alert-success alert-dismissible" ng-show="show_sent_message" role="alert"> |
|
| 28 |
+ <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button> |
|
| 29 |
+ <strong>Successo!</strong> Sua mensagem foi enviada. |
|
| 30 |
+ </div> |
|
| 26 | 31 |
<form> |
| 27 | 32 |
<div class="row"> |
| 28 | 33 |
<div class="col-md-3"> |
@@ -52,6 +57,7 @@ |
||
| 52 | 57 |
<label for="exampleInputEmail1">Mensagem</label> |
| 53 | 58 |
<textarea class="form-control" rows="5" ng-model="msgData.message" id="userMessage" required></textarea> |
| 54 | 59 |
</div> |
| 60 |
+ |
|
| 55 | 61 |
<p style="text-align: center;"> |
| 56 | 62 |
<button type="submit" ng-click="sendMessage(msgData)" value="Enviar" id="SubmitBtn" class="btn btn-success">Enviar</button> |
| 57 | 63 |
</p> |
+ 6
- 3
app/views/main.html
@@ -10,6 +10,7 @@ |
||
| 10 | 10 |
<img src="images/laser-poster-mobile.jpg" alt="..." style="width: 100%;" class="visible-xs"> |
| 11 | 11 |
</div> |
| 12 | 12 |
|
| 13 |
+<!-- |
|
| 13 | 14 |
<div class="container"> |
| 14 | 15 |
<h1 class="page-header">Serviços</h1> |
| 15 | 16 |
<div class="row"> |
@@ -47,11 +48,12 @@ |
||
| 47 | 48 |
</div> |
| 48 | 49 |
</div> |
| 49 | 50 |
</div> |
| 51 |
+--> |
|
| 50 | 52 |
|
| 51 |
-<div class="container last"> |
|
| 52 |
- <h1 class="page-header">Últimos trabalhos</h1> |
|
| 53 |
+<div class="container last" style="margin-top: 50px;"> |
|
| 54 |
+ <!--<h1 class="page-header">Últimos trabalhos</h1>--> |
|
| 53 | 55 |
<div class="row"> |
| 54 |
- <div class="col-xs-6 col-sm-3 col-md-3" ng-repeat="image in images | limitTo:4"> |
|
| 56 |
+ <div class="col-xs-6 col-sm-3 col-md-3" ng-repeat="image in images | limitTo:8"> |
|
| 55 | 57 |
<a ng-click="openLightboxModal($index)" class="thumbnail"> |
| 56 | 58 |
<img ng-src="{{image.thumbUrl}}">
|
| 57 | 59 |
</a> |
@@ -59,6 +61,7 @@ |
||
| 59 | 61 |
<div style="clear: both"></div> |
| 60 | 62 |
<div class="row"> |
| 61 | 63 |
<div class="col-md-12" style="text-align: center; margin-top: 25px;"> |
| 64 |
+ <a ui-sref="servicos" class="btn btn-success">Ver serviços</a> |
|
| 62 | 65 |
<a ui-sref="portfolio" class="btn btn-primary">Visitar portfolio</a> |
| 63 | 66 |
</div> |
| 64 | 67 |
</div> |